From 61223e291d90e317c104b0625d76bcf6bf2b26f5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 28 Aug 2001 19:06:58 +0000 Subject: [PATCH] gdk-pixbuf/test-loaders.c (test_loader): Catch errors at close time. gdk-pixbuf/test-loaders.c (main): Remove C++ comments. demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf only in response to an area_prepared signal. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ demos/testpixbuf.c | 16 ++++++---------- gdk-pixbuf/ChangeLog | 11 +++++++++-- gdk-pixbuf/test-loaders.c | 8 ++++---- 10 files changed, 54 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 082ed119c4..253b9e223f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Aug 28 20:06:07 2001 Matthias Clasen + + * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf + only in response to an area_prepared signal. + 2001-08-28 Alex Larsson * gtk/gtkwidget.c (gtk_widget_class_init): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 082ed119c4..253b9e223f 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Tue Aug 28 20:06:07 2001 Matthias Clasen + + * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf + only in response to an area_prepared signal. + 2001-08-28 Alex Larsson * gtk/gtkwidget.c (gtk_widget_class_init): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 082ed119c4..253b9e223f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Aug 28 20:06:07 2001 Matthias Clasen + + * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf + only in response to an area_prepared signal. + 2001-08-28 Alex Larsson * gtk/gtkwidget.c (gtk_widget_class_init): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 082ed119c4..253b9e223f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Tue Aug 28 20:06:07 2001 Matthias Clasen + + * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf + only in response to an area_prepared signal. + 2001-08-28 Alex Larsson * gtk/gtkwidget.c (gtk_widget_class_init): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 082ed119c4..253b9e223f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Aug 28 20:06:07 2001 Matthias Clasen + + * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf + only in response to an area_prepared signal. + 2001-08-28 Alex Larsson * gtk/gtkwidget.c (gtk_widget_class_init): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 082ed119c4..253b9e223f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Aug 28 20:06:07 2001 Matthias Clasen + + * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf + only in response to an area_prepared signal. + 2001-08-28 Alex Larsson * gtk/gtkwidget.c (gtk_widget_class_init): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 082ed119c4..253b9e223f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Aug 28 20:06:07 2001 Matthias Clasen + + * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf + only in response to an area_prepared signal. + 2001-08-28 Alex Larsson * gtk/gtkwidget.c (gtk_widget_class_init): diff --git a/demos/testpixbuf.c b/demos/testpixbuf.c index a61491fdde..c1d55b64df 100644 --- a/demos/testpixbuf.c +++ b/demos/testpixbuf.c @@ -449,19 +449,15 @@ update_timeout(gpointer data) } - } else { /* Really done */ - - GdkPixbuf *pixbuf = gdk_pixbuf_loader_get_pixbuf (status->loader); - new_testrgb_window (pixbuf, "After progressive load"); - done = TRUE; - - } - + } + else + done = TRUE; + if (done) { - gtk_widget_queue_draw(*status->rgbwin); /* ignoring errors, we should not do that. */ gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (status->loader), NULL); - g_object_unref (G_OBJECT(status->loader)); + gtk_widget_queue_draw (*status->rgbwin); + g_object_unref (G_OBJECT (status->loader)); fclose (status->imagefile); g_free (status->buf); } diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index e36719def0..bc6b35981d 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,9 +1,16 @@ -2001-08-21 Matthias Clasen +Tue Aug 28 20:10:31 2001 Matthias Clasen + +Tue Aug 28 20:03:43 2001 Matthias Clasen + + * test-loaders.c (test_loader): Catch errors at close time. + * test-loaders.c (main): Remove C++ comments. + +2001-08-21 Matthias Clasen * Makefile.am, gdk-pixbuf-io.c, pixbufloader_tga.def, io-tga.c: Add tga loader, patch by Nicola Girardi. (#56067) -2001-08-20 Matthias Clasen +2001-08-20 Matthias Clasen * test-images.h, test-loaders.c: Add ico and wbmp tests. * io-jpeg.c (gdk_pixbuf__jpeg_image_save): Fail with a suitable diff --git a/gdk-pixbuf/test-loaders.c b/gdk-pixbuf/test-loaders.c index 12385b23ab..f0b14a89a6 100644 --- a/gdk-pixbuf/test-loaders.c +++ b/gdk-pixbuf/test-loaders.c @@ -148,7 +148,7 @@ test_loader (const guchar *bytes, gsize len, gboolean data_is_ok) err = NULL; did_fail = TRUE; } - gdk_pixbuf_loader_close (loader, NULL); + gdk_pixbuf_loader_close (loader, &err); if (err) { g_error_free (err); @@ -404,8 +404,8 @@ main (int argc, char **argv) TEST (tiff1_test_1, FALSE); #if 0 - TEST_RANDOMLY_MODIFIED (valid_gif_test, FALSE); // these all break more or - TEST_RANDOMLY_MODIFIED (valid_png_test, FALSE); // less spectacularly, patched or not + TEST_RANDOMLY_MODIFIED (valid_gif_test, FALSE); /* these all break more or */ + TEST_RANDOMLY_MODIFIED (valid_png_test, FALSE); /* less spectacularly, patched or not */ TEST_RANDOMLY_MODIFIED (valid_tiff1_test, FALSE); #endif @@ -416,7 +416,7 @@ main (int argc, char **argv) * the wbmp loader is broken */ #endif - TEST_RANDOMLY_MODIFIED (valid_jpeg_test, FALSE); // The jpeg loader does not break + TEST_RANDOMLY_MODIFIED (valid_jpeg_test, FALSE); /* The jpeg loader does not break */ #if 0 TEST_RANDOM (GIF_HEADER, 150, FALSE); -- 2.30.2